From b1f056a8025d59e617affe6a03d655a92c61b289 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 May 2005 16:22:20 +0000 Subject: [PATCH] Remove the no longer needed workaround. 2005-05-18 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Remove the no longer needed workaround. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilechooserdefault.c | 2 -- gtk/gtkwidget.c | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03514376e5..7f8e6b38b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-05-18 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): + Remove the no longer needed workaround. + + * gtk/gtkwidget.c (widget_add_child_draw_rectangle): Only collect + allocations of mapped children. + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Add a bug reference. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 03514376e5..7f8e6b38b2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2005-05-18 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): + Remove the no longer needed workaround. + + * gtk/gtkwidget.c (widget_add_child_draw_rectangle): Only collect + allocations of mapped children. + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Add a bug reference. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 03514376e5..7f8e6b38b2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2005-05-18 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): + Remove the no longer needed workaround. + + * gtk/gtkwidget.c (widget_add_child_draw_rectangle): Only collect + allocations of mapped children. + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Add a bug reference. diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index b5f725db62..41c61aa8b9 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -670,8 +670,6 @@ gtk_file_chooser_default_init (GtkFileChooserDefault *impl) impl->load_state = LOAD_EMPTY; impl->pending_select_paths = NULL; - /* this is a workaround for bug #135903 */ - gtk_widget_set_redraw_on_allocate (GTK_WIDGET (impl), TRUE); gtk_box_set_spacing (GTK_BOX (impl), 12); impl->tooltips = gtk_tooltips_new (); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index da8bbaa5b4..7b925a50c9 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2444,7 +2444,7 @@ widget_add_child_draw_rectangle (GtkWidget *widget, { GdkRectangle child_rect; - if (!GTK_WIDGET_REALIZED (widget) || + if (!GTK_WIDGET_MAPPED (widget) || widget->window != widget->parent->window) return; -- 2.30.2